[MAINT] Fix github_organization_ruleset and github_repository_ruleset with push target
#2958
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nickfloyd
reviewed
Dec 2, 2025
stevehipwell
reviewed
Dec 3, 2025
Collaborator
stevehipwell
left a comment
stevehipwell
left a comment
There was a problem hiding this comment.
I think this change likely wants to wait for the SDK upgrade as a lot of this area is modified in future versions.
FYI the error behaviours previously seen should have been mitigated by #2705 so if there is an error the provider should handle it gracefully.
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
0531db8 to
9dd2965
Compare
1 task
stevehipwell
reviewed
Dec 5, 2025
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
1bdfa45 to
efd67ae
Compare
deiga
changed the title
github_organization_ruleset with push targetgithub_organization_ruleset with push target
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
52d95d4 to
6782aab
Compare
stevehipwell
requested changes
Dec 10, 2025
Collaborator
stevehipwell
left a comment
stevehipwell
left a comment
There was a problem hiding this comment.
Would it be possible to either de-scope this PR or open a new PR with the smallest number of changes possible to fix the outstanding bugs?
| }, | ||
| "bypass_actors": { | ||
| Type: schema.TypeList, | ||
| Type: schema.TypeList, // TODO: These are returned from GH API sorted by actor_id, we might want to investigate if we want to include sorting |
Collaborator
There was a problem hiding this comment.
I think we should sort the returned values based on the inputs which would stop churn.
Contributor
Author
There was a problem hiding this comment.
That sounds sensible, need to investigate where the best place for the sorting is
Contributor
Author
There was a problem hiding this comment.
@stevehipwell after some investigation, it seems that schema.TypeSet would be the correct way to implement unsorted. What do you think?
Contributor
Author
|
@stevehipwell Yes, I agree. I've done that already in this PR: #2976 But I can't switch the base of this PR to point to that :) |
deiga
changed the title
github_organization_ruleset with push targetgithub_organization_ruleset and github_repository_ruleset with push target
deiga
force-pushed
the
org-ruleset-fix-push
branch
2 times, most recently
from
1fe74fc to
2a2277a
Compare
5 tasks
stevehipwell
requested changes
Jan 13, 2026
Collaborator
stevehipwell
left a comment
stevehipwell
left a comment
There was a problem hiding this comment.
I've added some review comments, mainly about the code structure.
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
… to org rulesets will never be a thing Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
…esponse Signed-off-by: Timo Sand <[email protected]>
As they differ from `branch` and `tag` rules Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
…ved` repos to be private This allows even EMU users to run these tests Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
…` and `rules` Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
…anything Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
Signed-off-by: Timo Sand <[email protected]>
…easier debugging Signed-off-by: Timo Sand <[email protected]>
deiga
force-pushed
the
org-ruleset-fix-push
branch
from
c1019c3 to
d51fea0
Compare
Signed-off-by: Timo Sand <[email protected]>
…thing Signed-off-by: Timo Sand <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #2929, #2467
Before the change?
ref_namewould cause the provider to Panic asref_nameis a required fieldruleswhich weren't valid forpushrulesetsAfter the change?
pushrulesets to an organizationref_nameshould no longer be needed to be set forpushtargetconditions&targetvalidation logic should ensure correct fields are populatedPull request checklist
Schema migrations have been created if needed (example)Does this introduce a breaking change?
Please see our docs on breaking changes to help!